Pass in the right value of initial_emission to

Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
	in the right value of initial_emission to
	gtk_widget_set_style_internal (#57091)

diff --git a/ChangeLog b/ChangeLog
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5021df944ab4a9dd6619271dc360f6a28d3dc5fd..c91442e8ebbfb2b045eca2de10a197ec3a921866 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jul  5 08:57:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Pass
+       in the right value of initial_emission to
+       gtk_widget_set_style_internal (#57091)
+
 Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 34bfb84883dd6927c0e543e7f6fdfb0a1049944f..77ca31a088c4548ceb9a21b4edda6b609a0df5d3 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3574,7 +3574,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
     new_style = gtk_widget_get_default_style ();
 
   if (initial_emission || new_style != widget->style)
-    gtk_widget_set_style_internal (widget, new_style, TRUE);
+    gtk_widget_set_style_internal (widget, new_style, initial_emission);
 }
 
 /**